1 files changed, 41 insertions, 66 deletions

diff --git a/app/[lng]/evcp/(evcp)/po-rfq/page.tsx b/app/[lng]/evcp/(evcp)/po-rfq/page.tsx
index dfaa7708..bdeae25e 100644
--- a/app/[lng]/evcp/(evcp)/po-rfq/page.tsx
+++ b/app/[lng]/evcp/(evcp)/po-rfq/page.tsx
@@ -1,86 +1,61 @@
-import { Suspense } from "react"
 import { getPORfqs } from "@/lib/procurement-rfqs/services"
 import { searchParamsCache } from "@/lib/procurement-rfqs/validations"
+import { getValidFilters } from "@/lib/data-table"
 import { Shell } from "@/components/shell"
 import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
-import RFQContainer from "@/components/po-rfq/po-rfq-container"
+import { RFQListTable } from "@/lib/procurement-rfqs/table/rfq-table"
+import { type SearchParams } from "@/types/table"
+import * as React from "react"
 
 interface RfqPageProps {
-  searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
-  title?: string;
-  description?: string;
+  searchParams: Promise<SearchParams>
 }
 
-export default async function RfqPage({
-  searchParams,
-  title = "발주용 견적",
-  description = "SAP으로부터 전송된 발주용 견적을 관리할 수 있습니다.",
-}: RfqPageProps) {
+export default async function RfqPage(props: RfqPageProps) {
   // searchParams를 await하여 resolve
-  const resolvedSearchParams = await searchParams;
-
-  // 서버 액션: RFQ 데이터 가져오기
-  async function fetchRfqData(params: any) {
-    "use server"
-    
-    try {
-      // URL 파라미터를 추출하고 필요한 형식으로 변환
-      const parsedParams = searchParamsCache.parse(params);
-
-      // RFQ 데이터 가져오기
-      const data = await getPORfqs(parsedParams)
-        
-      return data
-    } catch (error) {
-      console.error("RFQ 데이터 조회 오류:", error)
-      // 에러 발생 시 빈 결과 반환
-      return { data: [], pageCount: 0, total: 0 }
-    }
-  }
-
-  // 현재 resolvedSearchParams를 파싱하여 초기 데이터 로드
-  const initialParams = {
-    page: resolvedSearchParams.page?.toString() || "1",
-    perPage: resolvedSearchParams.perPage?.toString() || "10",
-    sort: resolvedSearchParams.sort?.toString() || JSON.stringify([{ id: "updatedAt", desc: true }]),
-    filters: resolvedSearchParams.filters?.toString() || null,
-    joinOperator: resolvedSearchParams.joinOperator?.toString() || "and",
-    basicFilters: resolvedSearchParams.basicFilters?.toString() || null,
-    basicJoinOperator: resolvedSearchParams.basicJoinOperator?.toString() || "and",
-    search: resolvedSearchParams.search?.toString() || "",
-  }
-
-  // 초기 데이터 로드
-  const initialData = await fetchRfqData(initialParams)
+  const searchParams = await props.searchParams
+  
+  // 파라미터 파싱
+  const search = searchParamsCache.parse(searchParams);
+  const validFilters = getValidFilters(search.filters);
+  
+  // RFQ 서버는 기본필터와 고급필터를 분리해서 받으므로 그대로 전달
+  const promises = Promise.all([
+    getPORfqs({
+      ...search, // 모든 파라미터 전달 (page, perPage, sort, basicFilters, filters 등)
+      filters: validFilters, // 고급 필터를 명시적으로 오버라이드 (파싱된 버전)
+    })
+  ])
 
   return (
-    <Shell className="gap-2">
-      <div className="flex items-center justify-between space-y-2">
-        <div className="flex items-center justify-between space-y-2">
+    <Shell variant="fullscreen" className="h-full"> {/* fullscreen variant 사용 */}
+      {/* 고정 헤더 영역 */}
+      <div className="flex-shrink-0">
+        <div className="flex items-center justify-between">
           <div>
             <h2 className="text-2xl font-bold tracking-tight">
-              {title}
+              발주용 견적
             </h2>
           </div>
         </div>
       </div>
-        
-      <Suspense
-        fallback={
-          <DataTableSkeleton
-            columnCount={6}
-            searchableColumnCount={1}
-            filterableColumnCount={2}
-            cellWidths={["10rem", "40rem", "12rem", "12rem", "8rem", "8rem"]}
-            shrinkZero
-          />
-        }
-      >
-        <RFQContainer 
-          initialData={initialData}
-          fetchData={fetchRfqData}
-        />
-      </Suspense>
+
+      {/* 테이블 영역 - 남은 공간 모두 차지 */}
+      <div className="flex-1 min-h-0">
+        <React.Suspense
+          fallback={
+            <DataTableSkeleton
+              columnCount={8}
+              searchableColumnCount={2}
+              filterableColumnCount={3}
+              cellWidths={["10rem", "15rem", "12rem", "12rem", "8rem", "8rem", "10rem", "8rem"]}
+              shrinkZero
+            />
+          }
+        >
+          <RFQListTable promises={promises} className="h-full" />
+        </React.Suspense>
+      </div>
     </Shell>
   )
 }
\ No newline at end of file